From ccb75f7da672f27663ade8a687b3f96a2006512c Mon Sep 17 00:00:00 2001 From: "emellor@leeni.uk.xensource.com" Date: Thu, 1 Dec 2005 03:26:47 +0000 Subject: [PATCH] Work around the fact that the physinfo dom0 call is not implemented for IA64. Signed-off-by: Ewan Mellor --- tools/python/xen/util/bugtool.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/python/xen/util/bugtool.py b/tools/python/xen/util/bugtool.py index 06c924beef..646149cfc1 100644 --- a/tools/python/xen/util/bugtool.py +++ b/tools/python/xen/util/bugtool.py @@ -69,10 +69,17 @@ those logs from the archive. bugball = [] xc = xen.lowlevel.xc.xc() - bugball.append(string_iterator('xen-dmesg', xc.readconsolering())) - bugball.append(string_iterator('physinfo', prettyDict(xc.physinfo()))) - bugball.append(string_iterator('xeninfo', prettyDict(xc.xeninfo()))) - del xc + + def do(n, f): + try: + s = f() + except Exception, exn: + s = str(exn) + bugball.append(string_iterator(n, s)) + + do('xen-dmesg', lambda: xc.readconsolering()) + do('physinfo', lambda: prettyDict(xc.physinfo())) + do('xeninfo', lambda: prettyDict(xc.xeninfo())) for filename in FILES_TO_SEND: if not os.path.exists(filename): -- 2.30.2